made zombie FSM work for real

also set up all TODOs for future reference