lots more changes and a bunch of commented out experiments