Timezone

Same than antoine, but with rebase of dev
TODO markings?