progress on Exchange class