Yeah, I think so too. He even introduced a masked figure to mess with our heads, but it would be too convenient. + The Osiphirus guy seems to have a long straight tail, and Marshall's was curly. By the time mc realizes he fell in love with Xavier, he'll probably go like "I knew it all along, I just couldn't let myself believe it" or smt.