Some more Calculator add-ons for homework 7