WIP commit, routes and db in progress