Started implementing the master and relevant messages
Current implementation blocks in annoying places.