First developments (partial commit 11)