moved initial state to controller
Merge branch 'add-a-controller'