Update with loads of files, a first pretty much working version