neew stuff

done with nate and rennie