Some TODOs and a cyclic dependancy fix