Added scenes functionality
Merge done