New Calculator Features

Change-Id: Ib2fdbcabe89fe923ff04d00a2d76b909189e98c7