Initial stages of refactoring items into components instead of inheritance