Changing the structure around a bit. Preparing for event based leaf decay