Add in tr and dirname
 -Erik
10 files changed