More flexability for my Grade class