working version of yesterday's commit.

Modified some switching between states and removing objects.
All that's left now should be cleaning up and maybe add respawn
invincibility.