Collidable enemies

Things are getting messy. I'm thinking of refactoring before I start on
combat.