Manual merge/overwrite from tsundere branch

Since I can't seem to do this the right way