Feature/pubsub

Altered models for bridge