Q2 structure in place, Changing some vars to constants, Adding hashtable
var