Would make it much easier to make sure ccorrect message is gotten, may be a big pain, may require gradle task