Merge pull request #14 from jonrish/staging

modify highlights controller
remove commented out code from highlights controller