More in-progress refactoring
More clean-up - need refactor