Did some work on stuff.
Partly implemented message routing
Ignoring conflicts