Moved to File objects, a few tests passing.