Reorginized, and attempted a new animation technique