Fixing app events and adding in the api's