WIP.  Code cleanup.  Start work on carousel.