Marked off some TODOs