Added Calculator -- Commit 2