Work in Progress, changes to attempt to fix multiuser mode bug