server refactor number one