bad stuff
badbad
fixed merge conflicts
adding utc conversion