Encapsulated Calculator Changes

Html is being re-written properly
CSS beginning soon