Make minions first class citizens

Don't merge yet; e2e failed, probably because of something else, but I need to investigate.