Intense changes. Model complete, minor tests. Logic changes in pieces
Merge remote-tracking branch 'origin/master'