Fix last bit of weirdness from merge conflict
Add activation/deactivation to action station