Calculator and notes

Change-Id: I70378d488acf2851e3a86fec8a4f20de618fcc8f