Cleaning up. Transitions fully functional.
Test Tweaking.