Change Details

This should mostly be fine, but I'd like to get some feedback before covering more tests in case there is something fundamentally wrong.