final(ish) versions of final model stuff