init commit
Merge https://github.com/polk1lo/cross_final