inital refactor not used
Merged conflicts
[#71794642]Refactored all code so far

Signed-off-by: Paul Wenig <pwenig@gmail.com>