refactoring to use comps/systems more