Ntp dev

New development branch. Do not merge.