First developments (partial commit 13)