Rewrote some grammer rukes so we have far less shift/reduce and reduce/reduce errors. Neerly squashed all the conflicts