Refactor
Add TO-DO section to README