Added caroussel thingamajig
Merge branch 'develop' into staging