small amount of fiddling and unfiddling
getting basic test to work
stupid compile errors sorted
*MMcE please sight all changes*