First round of modifications...progress!