Merge canvas_sif
Remove messages, improve client
Fix merge conflicts
Change Messaging to MessageBuilder