Seems to be functioning correctly.  Need review from Chris.