GUI - under construction
Added CommandListener
Merge origin/master