[TASK] Added some TODO ideas