Reworked some of the zombie context stuff

Still broken though.  Gonna retry and work out the nested logic again...
Reimplemented team logic to allow resue of contexts at same nest level

Still not passing 8 of the tests though.  One of which times out.