server stuff
merge
clean up