9c6de3d7c3
- adding plumbing for future support for spring-loaded adding of items - also, additional minor code cleanup Change-Id: Idb313d4cd125b4f0b315a845dc8fb853cb48885e