Improved clients data structure
Updated main to reflect new changes in clients