Got rid of some redundant code, still working to get mouse listeners active