Added in new animation and cleaned up the transitions between them