first cut of expand and it works pretty well!