adding some TODOs for @leggetter to review