Stephen - file input mostly done, still need to test