Nick/initial models fixes