Work in progress
Clean up models and routes
Merge branch 'WIP'