Port app to new calculation system