first work on 1.8

more work tomorrow