Scene implementation. Still need some fixes.
Merge branch 'scene'