Extending models, creating base model class with common functions
Merging in work from models branch, adding some views
Merging in work from models branch, adding some views