WIP Add empty controllers
Merge commits, add seed file and fixes association statements