More work on portal.models.py