partial: Lots of bulk changes