Todo and gitignore
MAjor tweaks