Kabuki and Triton stuff

completed