Added code for some TODOs