Merged Martin's and our file, some TODOs done.