Metadata/#53

Couldn't squash - should be a problem to bring these in individually