Add TODO/Considerations