refactoring

Work in Progress

Concept