More TODOs and explain linking to runtime