Significant work to re-componentize