initial commit - client and entities