diff --git a/Documentation/CHANGELOG.md b/Documentation/CHANGELOG.md
index 0f5d1487..f3e7bc0f 100644
--- a/Documentation/CHANGELOG.md
+++ b/Documentation/CHANGELOG.md
@@ -19,6 +19,7 @@ Release Data: TBD
 
 #### Minor Changes 
 
+* Use shock_history namespace for pre-evaluated shock history [#812](https://github.com/econ-ark/HARK/pull/812)
 * Fixes seed of PrefShkDstn on initialization and add tests for simulation output
 
 ### 0.10.7
diff --git a/HARK/core.py b/HARK/core.py
index eea1001f..77ff1dea 100644
--- a/HARK/core.py
+++ b/HARK/core.py
@@ -211,6 +211,7 @@ class AgentType(HARKobject):
         self.track_vars         = [] # NOQA
         self.poststate_vars     = [] # NOQA
         self.read_shocks        = False # NOQA
+        self.shock_history      = {}
         self.history            = {}
         self.assignParameters(**kwds) # NOQA
         self.resetRNG() # NOQA
@@ -478,16 +479,16 @@ class AgentType(HARKobject):
 
         # Make blank history arrays for each shock variable (and mortality)
         for var_name in self.shock_vars:
-            self.history[var_name] = np.zeros((self.T_sim, self.AgentCount)) + np.nan
-        self.history['who_dies'] = np.zeros((self.T_sim, self.AgentCount), dtype=bool)
+            self.shock_history[var_name] = np.zeros((self.T_sim, self.AgentCount)) + np.nan
+        self.shock_history['who_dies'] = np.zeros((self.T_sim, self.AgentCount), dtype=bool)
 
         # Make and store the history of shocks for each period
         for t in range(self.T_sim):
             self.getMortality()
-            self.history['who_dies'][t,:] = self.who_dies
+            self.shock_history['who_dies'][t,:] = self.who_dies
             self.getShocks()
             for var_name in self.shock_vars:
-                self.history[var_name][self.t_sim,:] = getattr(self, var_name)
+                self.shock_history[var_name][self.t_sim,:] = getattr(self, var_name)
             self.t_sim += 1
             self.t_age = self.t_age + 1  # Age all consumers by one period
             self.t_cycle = self.t_cycle + 1  # Age all consumers within their cycle
@@ -513,7 +514,7 @@ class AgentType(HARKobject):
         None
         '''
         if self.read_shocks:
-            who_dies = self.history['who_dies'][self.t_sim,:]
+            who_dies = self.shock_history['who_dies'][self.t_sim,:]
         else:
             who_dies = self.simDeath()
         self.simBirth(who_dies)
@@ -590,7 +591,7 @@ class AgentType(HARKobject):
         None
         '''
         for var_name in self.shock_vars:
-            setattr(self, var_name, self.history[var_name][self.t_sim, :])
+            setattr(self, var_name, self.shock_history[var_name][self.t_sim, :])
 
     def getStates(self):
         '''

track_vars cannot track PrefShkNow
**Describe the bug**
Adding `PrefShkNow` to `track_vars` results in broken history records.

**To Reproduce**

Run this code:
https://gist.github.com/sbenthall/e398fd3c389a9cc094974c397e49b160

See this output:

```
python pref_test.py 
0.6904681186891202 0.69046812
/home/sb/projects/econ-ark/HARK/HARK/interpolation.py:1721: RuntimeWarning: All-NaN slice encountered
  y = self.compare(fx,axis=1)
[[nan nan nan ... nan nan nan]
 [nan nan nan ... nan nan nan]
 [nan nan nan ... nan nan nan]
 ...
 [nan nan nan ... nan nan nan]
 [nan nan nan ... nan nan nan]
 [nan nan nan ... nan nan nan]]
[[nan nan nan ... nan nan nan]
 [nan nan nan ... nan nan nan]
 [nan nan nan ... nan nan nan]
 ...
 [nan nan nan ... nan nan nan]
 [nan nan nan ... nan nan nan]
 [nan nan nan ... nan nan nan]]
```

**Expected behavior**

When `PrefShkNow` is removed from `track_vars`, and the corresponding print statement is removed, the numerical values of `cNrmNow` are displayed.

```
$ python pref_test.py 
0.6904681186891202 0.69046812
[[1.31820519 1.13599726 1.19117047 ... 1.15580804 0.92238984 0.79139412]
 [1.75227515 0.87249487 1.03166147 ... 1.09467154 1.04217198 0.81947656]
 [1.6132044  1.21100077 1.10807752 ... 1.04517571 0.97166597 0.93927158]
 ...
 [1.41013941 0.98367178 0.99266247 ... 1.19269696 1.00552796 1.02108079]
 [1.19004436 1.32309231 1.52353897 ... 1.10650642 0.87607768 0.92796219]
 [1.07060879 0.94171512 1.06713576 ... 0.94867343 0.8665761  0.93075895]]
```

I expect a similar thing when adding `PrefShkNow` to be tracked.

diff --git a/HARK/ConsumptionSaving/tests/test_ConsPrefShockModel.py b/HARK/ConsumptionSaving/tests/test_ConsPrefShockModel.py
index 6ddb3c24..689f0d51 100644
--- a/HARK/ConsumptionSaving/tests/test_ConsPrefShockModel.py
+++ b/HARK/ConsumptionSaving/tests/test_ConsPrefShockModel.py
@@ -34,7 +34,7 @@ class testPrefShockConsumerType(unittest.TestCase):
 
     def test_simulation(self):
         self.agent.T_sim = 10
-        self.agent.track_vars = ["cNrmNow"]
+        self.agent.track_vars = ["cNrmNow", "PrefShkNow"]
         self.agent.makeShockHistory()  # This is optional
         self.agent.initializeSim()
         self.agent.simulate()
@@ -44,6 +44,16 @@ class testPrefShockConsumerType(unittest.TestCase):
             0.7366020536567589
         )
 
+        self.assertEqual(
+            self.agent.shock_history['PrefShkNow'][0][5],
+            self.agent.history['PrefShkNow'][0][5]
+        )
+
+        self.assertEqual(
+            self.agent.history['PrefShkNow'][0][5],
+            0.4909415933881665
+        )
+
 class testKinkyPrefConsumerType(unittest.TestCase):
 
     def setUp(self):

pip install -e .
parse_log_pytest
requirements.txt
pytest
apt-get update apt-get install -y gcc
3.7
requirements.txt
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
alabaster==0.7.13
anyio==3.7.1
argon2-cffi==23.1.0
argon2-cffi-bindings==21.2.0
attrs==24.2.0
Babel==2.14.0
backcall==0.2.0
beautifulsoup4==4.13.3
bleach==6.0.0
certifi @ file:///croot/certifi_1671487769961/work/certifi
cffi==1.15.1
charset-normalizer==3.4.1
comm==0.1.4
commonmark==0.9.1
cycler==0.11.0
debugpy==1.7.0
decorator==5.1.1
defusedxml==0.7.1
dill==0.3.7
docutils==0.18.1
-e git+https://github.com/econ-ark/HARK.git@0f906bfed5582f047ce774ec8ee9cd5df41f10b0#egg=econ_ark
entrypoints==0.4
exceptiongroup==1.2.2
fastjsonschema==2.21.1
flake8==5.0.4
fonttools==4.38.0
funcsigs==1.0.2
future==1.0.0
idna==3.10
imagesize==1.4.1
importlib-metadata==4.2.0
importlib-resources==5.12.0
iniconfig==2.0.0
interpolation==2.2.3
ipykernel==6.16.2
ipython==7.34.0
ipython-genutils==0.2.0
ipywidgets==8.1.5
jedi==0.19.2
Jinja2==3.1.6
joblib==1.3.2
json5==0.9.16
jsonschema==4.17.3
jupyter==1.1.1
jupyter-console==6.6.3
jupyter-server==1.24.0
jupyter_client==7.4.9
jupyter_core==4.12.0
jupyterlab==3.5.3
jupyterlab-pygments==0.2.2
jupyterlab_server==2.15.2
jupyterlab_widgets==3.0.13
kiwisolver==1.4.5
llvmlite==0.39.1
MarkupSafe==2.1.5
matplotlib==3.5.3
matplotlib-inline==0.1.6
mccabe==0.7.0
mistune==3.0.2
mpmath==1.3.0
nbclassic==1.2.0
nbclient==0.7.4
nbconvert==7.6.0
nbformat==5.8.0
nbsphinx==0.4.3
nest-asyncio==1.6.0
notebook==6.5.7
notebook_shim==0.2.4
numba==0.56.4
numpy==1.21.6
packaging==24.0
pandas==1.3.5
pandocfilters==1.5.1
parso==0.8.4
pexpect==4.9.0
pickleshare==0.7.5
Pillow==9.5.0
pkgutil_resolve_name==1.3.10
pluggy==1.2.0
prometheus-client==0.17.1
prompt_toolkit==3.0.48
psutil==7.0.0
ptyprocess==0.7.0
pycodestyle==2.9.1
pycparser==2.21
pyflakes==2.5.0
Pygments==2.17.2
pyparsing==3.1.4
pyrsistent==0.19.3
pytest==7.4.4
python-dateutil==2.9.0.post0
pytz==2025.2
pyzmq==26.2.1
quantecon==0.8.0
recommonmark==0.7.1
requests==2.31.0
scipy==1.7.3
seaborn==0.12.2
Send2Trash==1.8.3
six==1.17.0
sniffio==1.3.1
snowballstemmer==2.2.0
soupsieve==2.4.1
Sphinx==1.6.7
sphinx-rtd-theme==1.2.1
sphinxcontrib-jquery==2.0.0
sphinxcontrib-serializinghtml==1.1.5
sphinxcontrib-websupport==1.2.4
sympy==1.10.1
Tempita==0.5.2
terminado==0.17.1
tinycss2==1.2.1
tomli==2.0.1
tornado==6.2
traitlets==5.9.0
typing_extensions==4.7.1
urllib3==2.0.7
wcwidth==0.2.13
webencodings==0.5.1
websocket-client==1.6.1
widgetsnbextension==4.0.13
zipp==3.15.0

name: HARK
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - ca-certificates=2025.2.25=h06a4308_0
  - certifi=2022.12.7=py37h06a4308_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.4.4=h6a678d5_1
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - ncurses=6.4=h6a678d5_0
  - openssl=1.1.1w=h7f8727e_0
  - pip=22.3.1=py37h06a4308_0
  - python=3.7.16=h7a1cb2a_0
  - readline=8.2=h5eee18b_0
  - setuptools=65.6.3=py37h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - wheel=0.38.4=py37h06a4308_0
  - xz=5.6.4=h5eee18b_1
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - alabaster==0.7.13
      - anyio==3.7.1
      - argon2-cffi==23.1.0
      - argon2-cffi-bindings==21.2.0
      - attrs==24.2.0
      - babel==2.14.0
      - backcall==0.2.0
      - beautifulsoup4==4.13.3
      - bleach==6.0.0
      - cffi==1.15.1
      - charset-normalizer==3.4.1
      - comm==0.1.4
      - commonmark==0.9.1
      - cycler==0.11.0
      - debugpy==1.7.0
      - decorator==5.1.1
      - defusedxml==0.7.1
      - dill==0.3.7
      - docutils==0.18.1
      - entrypoints==0.4
      - exceptiongroup==1.2.2
      - fastjsonschema==2.21.1
      - flake8==5.0.4
      - fonttools==4.38.0
      - funcsigs==1.0.2
      - future==1.0.0
      - idna==3.10
      - imagesize==1.4.1
      - importlib-metadata==4.2.0
      - importlib-resources==5.12.0
      - iniconfig==2.0.0
      - interpolation==2.2.3
      - ipykernel==6.16.2
      - ipython==7.34.0
      - ipython-genutils==0.2.0
      - ipywidgets==8.1.5
      - jedi==0.19.2
      - jinja2==3.1.6
      - joblib==1.3.2
      - json5==0.9.16
      - jsonschema==4.17.3
      - jupyter==1.1.1
      - jupyter-client==7.4.9
      - jupyter-console==6.6.3
      - jupyter-core==4.12.0
      - jupyter-server==1.24.0
      - jupyterlab==3.5.3
      - jupyterlab-pygments==0.2.2
      - jupyterlab-server==2.15.2
      - jupyterlab-widgets==3.0.13
      - kiwisolver==1.4.5
      - llvmlite==0.39.1
      - markupsafe==2.1.5
      - matplotlib==3.5.3
      - matplotlib-inline==0.1.6
      - mccabe==0.7.0
      - mistune==3.0.2
      - mpmath==1.3.0
      - nbclassic==1.2.0
      - nbclient==0.7.4
      - nbconvert==7.6.0
      - nbformat==5.8.0
      - nbsphinx==0.4.3
      - nest-asyncio==1.6.0
      - notebook==6.5.7
      - notebook-shim==0.2.4
      - numba==0.56.4
      - numpy==1.21.6
      - packaging==24.0
      - pandas==1.3.5
      - pandocfilters==1.5.1
      - parso==0.8.4
      - pexpect==4.9.0
      - pickleshare==0.7.5
      - pillow==9.5.0
      - pkgutil-resolve-name==1.3.10
      - pluggy==1.2.0
      - prometheus-client==0.17.1
      - prompt-toolkit==3.0.48
      - psutil==7.0.0
      - ptyprocess==0.7.0
      - pycodestyle==2.9.1
      - pycparser==2.21
      - pyflakes==2.5.0
      - pygments==2.17.2
      - pyparsing==3.1.4
      - pyrsistent==0.19.3
      - pytest==7.4.4
      - python-dateutil==2.9.0.post0
      - pytz==2025.2
      - pyzmq==26.2.1
      - quantecon==0.8.0
      - recommonmark==0.7.1
      - requests==2.31.0
      - scipy==1.7.3
      - seaborn==0.12.2
      - send2trash==1.8.3
      - six==1.17.0
      - sniffio==1.3.1
      - snowballstemmer==2.2.0
      - soupsieve==2.4.1
      - sphinx==1.6.7
      - sphinx-rtd-theme==1.2.1
      - sphinxcontrib-jquery==2.0.0
      - sphinxcontrib-serializinghtml==1.1.5
      - sphinxcontrib-websupport==1.2.4
      - sympy==1.10.1
      - tempita==0.5.2
      - terminado==0.17.1
      - tinycss2==1.2.1
      - tomli==2.0.1
      - tornado==6.2
      - traitlets==5.9.0
      - typing-extensions==4.7.1
      - urllib3==2.0.7
      - wcwidth==0.2.13
      - webencodings==0.5.1
      - websocket-client==1.6.1
      - widgetsnbextension==4.0.13
      - zipp==3.15.0
prefix: /opt/conda/envs/HARK

HARK/ConsumptionSaving/tests/test_ConsPrefShockModel.py::testPrefShockConsumerType::test_simulation
HARK/ConsumptionSaving/tests/test_ConsPrefShockModel.py::testPrefShockConsumerType::test_solution HARK/ConsumptionSaving/tests/test_ConsPrefShockModel.py::testKinkyPrefConsumerType::test_simulation HARK/ConsumptionSaving/tests/test_ConsPrefShockModel.py::testKinkyPrefConsumerType::test_solution
Documentation/CHANGELOG.md HARK/core.py
Documentation/CHANGELOG.md HARK/core.py