new events refactored in

- the app still dosn't really work with the queue yet, getting close