Invariants and zombies

Ready-ish