my first commit
Merge https://github.com/zeroflyfire/code