Trying to fix message parsing
Merge branch 'feature'
More ware work