New client management system - no longer limited to 4