Merging master and refactor.
Updated scene to include refactored components.