Closer to the final energy model
Most of the radical changes in the previous energy evaluation model has been backed off - it'a good way to test on the extremes, and then to dial it back to where it seems best, rather than making lots of timy incremental steps. Anyway, let's see if that big map is good now.