deciving merges for the win
fixed model order issues. Unit tests working.
Old model classes now new api shell classes.
more refector