added TODO for future features and enhancements