First developments (partial commit 3)