Finished up SMS handling