Began working on server section