cleaning up, refactoring the way building is handled, and toying with the idea of not having templates anymore