This certainly looks like an improvement but still concerned that if we determine that we need the existing units, that we're still loading all of the existing units into memory.  Perhaps no way around it.