Merge Request, With Functioning Scenes!

And none were deleted, yay.