Refactored progressTrait etc., added composer vendor ignorance etc.