Trying to fix messy command manager
Added todo's from todo.txt