Fleshed out from-file a bit more