Action plan controller

#2) Merge me into Master, too, dammit!