Josh's first commit
Merge https://github.com/addrum/Calculate
joshies commit