first cut at pulling v2 parts together