refactored slideshow a bit and tests passing