Refactor to get ready for adding physics component.