commented out last changes and made naming changes to client