More Animation Work

I got the animations working, but it was really sloppy. I commented it
out and I'm starting over.