add loads of shite
resolve conflicts in routes and schema