Taylor Modified

Hiro, please pull in my test changes.  They're jus test