WIP: now with more files.