Push this further along, and fix build problems in the first patch.
Attach a file by drag & drop or click to upload
