First developments (partial commit 2)