Integrated server into client
Completed first goal