More message implementations. Better FIXMEs.