Actually just added in the commented code.  Cleaned up a few mistakes.