4 moved code to Grammar class, retooled code to fit restructure, implemented do whiles