getting some TODOs going
getting some TODOs going