Moved some things over into users route, working implementation