Made minimum viable changes required for basic multi-user functionality