Moving metadata out of WIP

re-PR with squished commits