More updates

Changed some so we actually can walk through the hashed list