changes that broke multi-user functionality
merged models.py