Sorry for the big refac but some namechanges and support for Bulk ops.