Started separating out components of server