Adding TODOs and setting up for future improvements.