Added todos and whatnot