Action plan controller

Merge me into Master, too, dammit!