Bug SetTracking

Tony, I reverted your proposal and come up with mine. If you want, you can meld my "code cleanup" commit into yours before merging for cleaner history.
Best Regards,
Alex