Hope to get this into the core sim at some point.