integrating things into main scene
More work on integrating stuff to the main scene
merging again