Add some TODOs for #62