Broken commit. Begin server implementation