Weekend hacks:

-Completed the transition function
-custom_toolbar is now a lot shorter
-Various refractoring