Apologies for a huge check-in, refactoring/refining?
In process, but wanted to save work