Re-added Calculator_Starter (oops, apparently that was important)
Merge branch 'simplification'