punching
merged tobys stuff
made seamless animations