Work

Work...
More refactoring

Just pushing for posterity.