Updated TODO + Added DefInjected

Read TODO update.