remove todo after checking with craig