Basic xray working, with if branch and ?mark support