Finish moving server over to JSON messages