Trying to make and global & cleaned up some non-needed code in that area