Message refactor - will break handlers.
Item handler work, start of specs.