Working on date ranges
Date now saves
Fixed DiscriminatorFormula bug