Finishing moving code around in frontend for multiuser mode