TONS of intro development
Fixed merge conflicts