Refactor - cut out ntp to put it in it's dedicated role