start turning the server into a managable class heirarchy