More metadata wip. #7