* new branch new me * cursed displacement * 2 pixels of death * forgot a line * fixed some edge cases on corgis with the displacement * fix conflict * fix indentations * a bit more displacement fixes