Fixing as per Renzo's input
Adding a toy server, need to move it to the tests though, and cleaning everything else up