Updates from prototyping.
Add some rough calculations.