Ready for further testing

Needs logging