Incremental change - started pulling remote file connection out into a
new class.