Tidy up and refactor solve routines
Add TODO list to README