Use the message switch more

Compiles, looks pretty -- what more do you need?