Draft model spec updated; fairly modular now