file loading is opaque now
merge commit