Added some date calculation - needs work, will get to it tomorrow