Phase 1 Complete :: Calculator

The latest change should reflect the latest complete version.