Frist pass at new transitions
WIP transitioning!