First developments (partial commit 18)