Preliminary work on simplifying and extending ModelFrame and ModelMatrix