gets all the test working and controllers

Fixes #19 
Fixes #16