Wrote some TODOs