in progress refactoring update (do not merge) #4

Closed andywood closed 2 years ago