Scene half done, buggy hiearchy fixed

Buggy handling needs tweaking
Merge pull request #2 from okacat/master

Scene half done, buggy hiearchy fixed