Work progress on CalculationsController