Work in progress for multi-user functionality