started process of splitting world class into two different classes for client/server