Revert "Done with phase 1"

This reverts commit cc6a0e2afad81a55f63c8c3983d7b3299cb41fbd.
Merge branch 'master' of https://github.com/horsetailfiddlehead/ee478