preliminary work on transitions.
bug fixes, most everything should be working.