Reworked to new message format, added a TODO document