Minor prep for simulation.
Will create new topic branch for remainder of simulation work.

Signed-off-by: Hunter Schoonover <hunter@folsomvillage.com>