update path to be correct
add some specific TODOs to Harry.