Added more refs
Removed old todos
Added list of todos