Brokers and initial implementation of bulk add started, more tests.