fix groupwait logic
Starting work on client functionality