Got some TODOs done