Started to work on some of the event hadling