I was worrying about this, specially your latest edit, when i mentioned cleaning up. We could limit to very new additions though just in case. I know that there's maybe no reason to think that this random additions are any worse than the random+selected pieces that were coding before, but just seems ugly somehow.