@wide-energy-11069: yea, that's a good start. might be worthwhile to break that ticket into two reviews... one to replace the boilerplate collections