Fix allocation counting; add hashmap (unused thus far)
Begin adding of variables...