Multi files

Sorry it took another day. I think this should be it.

Didn't edit the commit history because
1. I only had one commit and merge
2. I don't really know how :-)