Some refactoring. Like a lot of. But going into Saruman's footsteps - there is still much Work to Do