Daniel_H updates to Scene

I've made some changes to the scene, fixed a few things, and began work
on a new feature which is not currently being used by the scene.
Dani_t updates
fixed master with dani_h and dani_t