Resolving merge conflict
WIP - building carousel controllers