Started reworking server code to fit our model