Add datetime to model and cleanup some stuff