more todos. Dropbox messed up the .git folder, so maybe there will be weird history