first commit
Merge https://github.com/farocean97/ffd1