GOod progress on models, broken atm but easily fixable, tired