cleanup code and transition working...

albeit a bit janky