Repush of server refactor