Arrowhead Refactor

Minor nit: these are clearly configuration. Just make them constants somewhere, not messages.