Initial
Merge https://github.com/nitvic793/shift