File system file support

Sorry, this seems to have the other PR in it as well.. forgot to create a branch for that. I'll see if someone responds at all before fixing anything :)