owrking it
fixed date formats etc etc etc