renamed and started working on the client