jankily made rest work
Merge remote-tracking branch 'upstream/master'
Deleted mid file