started implementing hashtable/macro stuff