added directory lookup and began tokenization and filename matching