Stupid updates while rearranging grammar to maybe work