Started Frame class
Merge branch 'master' into gui
Merge branch 'master' into gui
Added stuff to listener