messing around with markers and refactoring

merge twilio work into master. texting works