Initial swap to new file field templating