Begins change to datetime
Revert "Temp fix for #64 - could do with improving"

This reverts commit b10d1da411bf3ea73b2aeb76981b2e594c584a23.