Continued iteration on Actions... based around the extended vocabulary