Got the transitions working correctly