WIP: a little bit more coherent now...