Billy - Added and changed to use the new carousel objects and maker.