progress
Merge https://github.com/arian-x/Trump