Fixed broken solution
Added RelevantDate and refactored the Locations