1st stab at multi-user support
fix comments