started carouselle refactoring