Use DateComponents instead of Date to coordinate between multiple modules. This should simplify the code and allow for future improvements.