Bugfix clean up user collection instead of Site *Ups*
Fuckup with merge
Add initial stuff for the queue