added in some TODOs.