messing with datetim
fixed merge
working on debugging date