More packet rework. Nearly done. needs testing.