Added TODOS for Ryan
Changed to better testing words