Finished Vegas scene functionality properly, and refactored a bit