rename AtomType->AtomVal and start flushing out Env