WIP
Pull request from Dr-Emman accepted + changes with listeners
Merge branch 'Dr-Emann-WorkInProgress'