adding Trait functionality
bulking up injection
moving to single mount point
updating todo