deleting old junk code, cleanup
added semi-complete concept, separated out dates