Final touches phone flow
ruh roh
ruh roh
Merge pull request #8 from eddiesanmarco/sean

Sean
conflict fixes