Remaining TODOs added