Things get added to client list again
Some things broken, but set for merging IN code