Wip: add multi-user support
Wip
Wip
Wip
Merge with Avy