wrap up the basic version of sms-based status update
fix merge conflicts