Going to implement a more sophisticated message parser