buliding out user routes
merged with origin/master