Refactoring screen manager
Update TODO.txt
Adding support to command line arguments