continued work on calculator class development