Added Stuff to calc.js and testPage.html, might need to redo DB, maybe