New grammar and their classes. Should be alright now