Work in progress, initial file layout