Add series of TODOs for NUCCORE-1100