missed the todos on this one