[TASK] Added some todo's