bunch of additions to FromFile based on playing around on the console