I'm Odd Jobs, and He's Shinsengumi
S7:E24Gin and Hijikata manage to track down the cat with part of Gin's soul in it, which is being looked after by Otae. Attempts to capture it are complicated when the rest of the gang turn up and have also swapped bodies!