Getting there, slowly

Still a lot to do - mostly due to mean test.cs and namespace issues