Got transitions to work sort of nicely