Inintial work on controllers, more tests