Updated controller and tests (not working)

Updated so Melanie could pull code from the branch.