Change Details

Patched it onto our internal phabricator build and fumbled around. Happy to write actual tests eventually, but I suspect heavy refactoring needs to go down.