Refactoring
Updated readme

Added a TODO list