Add Calculating state, fixes #2