added all features back
fixing not choosing address message
fix: working version
Merge branch 'develop'