Encapsulated Calculator Changes

Still working on trying to get info to write properly on clicks
Trying out both links and forms.