Lots of good progress.

Still can't push calculated values into model