Did some more stuff for encounters.  The basics are working, next step is to be able to add opponents.