Added stuff. Controller spec does not yet pass.