Allen's Model stuff

I messed up the previous merge and overwritten it (along with the
commit) somehow. Sorry about that Allen.