Start simplifying the big if-branches; read VolumeObjects