Work on listeners
worked on ui
Merge pull request #117 from HoltMaki/master

ui