Refactored some code and made binaries work again (hurray for tests!)