Starting work on client and server base and moving things around.