Starting to work on multi file support