Controller specs

Whitney's last commit that didn't get in the last pull I prematurely merged. I'm not merging my own code, I swear!