working api server
Random change
Fixed merge conflict + added semi colons