Restructure #2, also working on zombie animations.