Working on fixing Cameron's testing issues.