Work on the viewer - can now read a v22 map... kinda...