Adding base events, does not compile right now :D this is just to know where I left the work hehehe