WIP: working on serverside implementation
Passing all Rspec tests