first stab at splitting out models