Continue to try to break things out.
Alter the flow for the files.
Refactor.
Getting closer...