Done with first cut of metadata system