More work on the carousel. Checkin in before I start over.