Initial work on multi-file support