Done some TODOs