Initial
modesl
additional model work
model fixes