new stuff

we worked on this together
merge problems