Revert "#1 WIP"

This reverts commit e37b2aa0383e051179b66697e985a508c69e138e.