ActionSet on Border #45

I also refactored the dick out of actions and requirements