restructured the date functions, redid the query structure, prepped for final go tomorrow