Added some changes to allow 'modify' to use a setting in it's
calculation. Also, added the ability to use *today as a base.