Merge v1

I don't like this hardcoded packet offset 4 here, can you make this a constant?