Adding new collections.  Not in completely testable state but pushing towards that.  Soon will use collections instead of arrays in domain class which in turn should allow the removal of a lot of simple validation.