Also cleans up the schema a bit. Note that there's still a test that isnt passing
Attach a file by drag & drop or click to upload