Filled some TODOs, added 21 more TODOs