More work on entity/scene/component