Refactoring
Emptying is working, but adding new objects not