Begin merging of JRiot and LolChat apis