Git sync fork

@kevgo please review
Ah, sorry, brain fart. This is a verifying step.