Added client server message bus
Added todo