First developments (partial commit 15)