Added gapi stuff, creating new events