Feature request: Adding shots manually and putts as well

Dear Garmin,

You make great products. The Approach S60 is an amazing device, not just for golf but as a training companion and watch as well. Your autoshot feature is awesome but if you would add a feature where one manually could add a stroke the watch would be the "ultimate golf watch" in my book.

I would like this simple but powerful feature to work as following;

1) Upon making any stroke (shot, chip, putt etc.)
2) Autoshot detects your shot including GPS coordinates (if the watch incorrectly detects a sample/trial swing option to delete "shot" should be available)
3) Next the watch gives you the option to add a shot (if penalty)
4) Upon every shot you should be able to press a button (or on screen) to manually mark that a shot have been made. If this manual option is used your should also be given the option to chose which club that was used (e.g. also Putter). Using the manual option also register your GPS position thus giving you an excellent solution to also track your putts.
5) When hole is completed, press a button upon picking up the ball from the hole. This would register the hole position.

All of the above would give tracking of ALL shots including putts and including GPS-position of the hole for better and more detailed statistics as well as a complete map of each stroke for each hole.

Please acknowledge this feature request and become the undisputed no.1 golf watch product and operating system concerning golf features!!

Thanks!