made it so that current click is not used everywhere
merging
adding the menus for marker. The code will not build, but I need to pull.
Adding all my junk
merging