[WIP/TEMP] Concat fnames rework

This is to support #1097, so @splinterofchaos can tell me where I'm reasoning wrong, and travis can tell me which test is failing.
Indeed it would, if I get this working it should just be merged into the original PR, this is just some experimentation.