Moved some things around
Beginning of fleshing out server