Add faction check, and remove debug logging