week 2 controller changes
end of week 2 commit