Added Stack and Calculator classes