WIP: compilation OK, to test.