Started on a hashtable, and fixed few things