Almost there... git weirdness