Fix git problems? Also, beginning texture stuff.