Inerim checkin before playing with groups
Played around with grouping some more - do we really need names? What about other metadata?