FInal friday commit