DO NOT MERGE: Add roles for metadata

DO NOT MERGE untill I give the go ahead :)