getting this in early

i'll still be pushing changes.