Integrating NumberType into MathGame

Intermediate commit before Roland merges the branches together...