First developments (partial commit 17)