Add NPM test script
Separate out separate functions
Finish up new calculator