Added RightHand and Empty using our grammar, need to clean up some rules