Track our calculator

Also add cm's gson library (required by new calculator)