merge kaneda/knife

all aboard the crazy train