tons of scene garbage
merge fix
ton o stuff
merge