Working on adding listener
merging work
Merge branch 'master' of https://github.com/JT17/Canary2