Created an exception for $ at the start of the selection.  Removed some commented out code.