skel
reorg and major update
more changes to the test rig