Ping test compiles but doesn't work yet
Clean-ups before switching to mirami
More fixes. Almost there ...