Cleaned up code and tested date set. Need to implement in settings scree...

...n.