Major housekeeping, some message implementations
Some more message implementations