stuff
finshed merge