Finalizing re-work on the file builder.