Includes some fine tuning to fix a couple of todo's in the tests.
Attach a file by drag & drop or click to upload
