Prep for contribution

This change adds some additional TODOs to help identify where
contribution is needed.