Cross off more TODOs