Added some TODOs and another startup question