Update - more refactoring with more to do ...