Calendar dev 1.1