Added Public eventhandler
Added variables
cleanup
cleanup