entry buffer stuff
merge