Still moving towards entity-component system