fill in some TODOs