First developments (partial commit 16)