Feature/now 341

Kevin actually changed the way we do it in reviews to reflect chris's mocks, I changed it to this to be more consistent with his changes.