First developments (partial commit 1)