Figured out client side templating, and started refactoring the structure of controllers, also removed tests