Another Partial refactor...