First developments (partial commit 8)