Modify to assume best case that the entire message is present
Merge branch 'feature-whole-message-refactor'