Thanks for the detailed notes David, this will be a fun refactor! Will let you know how it goes.