added a boatload of stuff involving transitions, steps, etc.