Last of the res series. Similar to others, moved it to use data where it could.
The only real addition was adding assistant avatar (where applicable) to the scene.