Finished building out the gramar. Still need to comment and test further.