Fixing an order issue building hashtables.  Still not 100% correct, not capturing the last entry correctly.