Working on step transitions
Fix merge
Animated transitions