Encapsulated Calculator Additions

Tweaking things and trying to work out replacing each person’s
information on page