Single Hashtable with benchmarking code

Major code clean up.