A bit more progress with getting models working.