WIP needs to update routes and refactor