Done working on client1b for now