Adding TODOs and setup for future improvements.