Server Code Changes

Started looking through the server code as a basis for the swarch code.