Version 1.0 pre-release again

More stuff - still not anything like ready