fixed controller division of labor
Merge pull request #1 from ctailor2/katyDanny

fixed controller division of labor