Added support for all grades. Don't know what to do with Kindergarten (counting?) and first grade has two adds?. Also, need to work out simplification for 6th grade.