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.
merging kat with dani_h
merged kat with dani_h
Merge branch 'Daniel_h'