Revert "#31 Part two attempt"

This reverts commit f0a879a3fa39d1ec9e706e3d455c7bb7899e3a6f.