Connor and Ed change everything!  Kill works reasonably, still some code instability