continued refactoring. twilio is currently broken