Revert "early attempt at #11"

This reverts commit a685b5d1b94f61fd72dcbade054eaa2fc1140302.