Working on improving the carousel for #73