@ADmad Perfect, sounds great.  I'll go ahead and finish this PR up, and I'll work on a more broad PR for this in the near future.