I tested your changes. I added a small change, a different class name and played a bit with it. Nice, very nice! Because of the additional changes, I will add the code myself, if it's o.k. for you.
Trenne niemals Müll, denn er hat nur eine Silbe!