I really like the way you have collected math requirements under school grades because that is the common method in society for measuring ability. I encourage you to go beyond grade eight.  Give people grades 9 to 12 grades and college level math.  I understand the challenge of academic math levels versus college etc,  but start with a basic choice such as academic and add the other options over time.  

Thanks for a great way to refresh and review grade level math up to level 8 at least.