Generalized metadata works - needs polish