WiP before major change to file input