Carosels still messy, but some refactoring done, working.