working on some TODOs