almost made
merge