Added controller logic
merge conflicts
more merge conflicts