Add support for four-word actions

 - Possible that there are still action variations that are not accounted for
Merge branch 'grammar'

Conflicts:
	To do