Partial file resolution

Still a work in progress.