More work on new version
Working more on retriever.py
updated todo.list