Bug fixing the events ... now they work
Add some additional TO DO