working on routes
merging courey
commitment issues