add todo's after reviewing code with danny