Multi user

Accidentally I pushed a lot of commits to this branch instead of the master that was merged.