[UP] TODO list
[IMP] Make function to be local and change the commands functionnality