Updated animation stuff and classes