Finally the local drive helper working properly.  Updated some of it's templates.