Move everything from BulkBase into BulkEditor - we can get rid of BulkBase now