Continue to make grammar improvements. Still need unit tests