Added more to client, most events are set up for callbacks