Restructuring
Testing the removing and inserting
Fixed flapintervall
first fixes for removing and inserting.