Not a pretty commit. Stashing things to run tests.