Action refactor

I had some momentum around this this afternoon. Definitely not perfect (see the weird way that enemies are getting passed around, for example), but feels like a step in the right direction.