Encapsulated Calculator Additions

Writing info to page finally works properly
Must clean up code and fix double html printing
update function needed