stuff is broken need to be fixed
merge