Feature Request: Adding Waypoints to Elevation Profile

I apologize if this has already been suggested, but one thing that would be very useful is to be able to add in points of interest to the elevation profile of a route or track. I have done this (manually) using paint, but it seems like it could be a very useful feature.

As far as options, it would be nice to be able to:
1) add new waypoints directly from the elevation profile window
2) add existing waypoints to the elevation profile that are within <x> miles from the route/track (placing the waypoint at the point where its closest).

Here is a simple screenshot showing kind of what I'm talking about: