More transitioning
Merge pull request #24 from mtwebster/transition

More transitioning