Added currency support.  Working on Shape Names