Metadata wip. #7