Ok -- I think it makes sense to merge this initial piece of work in and then we can make a second revision which includes additional fields.