First developments (partial commit 9)