First developments (partial commit 12)