First developments (partial commit 14)