Refactored Code and added listener for Error Intents. Need to have it do something in case we actually get one.