feature: Lots of bulk changes still