First developments (partial commit 10)