Added date column, worked out null bugs.