Todo update
Moved TODO list to private repo
Fixed merge, removed todo