Refactor finally complete i think.
Missed file.