Initial work on new client