initial draft of changes for fabric integration.