Added TODOs for Jan