Removed Calculator Classes from the Demo... Why are they even here?