reverting changes to rewrite stuff, but keeping refactors, and doing it differently
refactor and tidy
Merge