Lots of changes
Positioning Code needs to be fixed
Add the various listeners/menus