Revert "Working on #24, sorry for the hacks"

This reverts commit e546fbe4d724c201fe5739231b9e25e18bf6db78.