WIP, showing correct views, ugly conditionals, and controller redirects to wrong model now