added more events! also untested code -- hooray