Or maybe checking hormone levels is good...he may on meds for the rest of his kitty life, though!

HUGS to Charlie and to you. Good luck!