Work on some model classes (mostly uncommitted stuff from a while ago)