partial: Still lots of bulk changes