Undying (When this creature dies, if it had no +1/+1 counters on it, return it to the battlefield under its owner's control with a +1/+1 counter on it.)

At the beginning of each upkeep, if a Zombie is in your graveyard, transform Undead Geist.