Almost done with adding SMS services