wip
V2 - refactor to c# for message glue