final david commit
Merge branch 'Near-Final' of https://github.com/Dracolord1208/G-Shift into Near-Final