TODOs (mostly to do after add tests), and make a few other changes.
Attach a file by drag & drop or click to upload
