Hopefully undid server implementation of stage 1