New Listener Version
Merge branch 'master' of https://github.com/ADoby/Project_Space_Pirate