added a lot more routes
merged
server starts now