Added in some date functionality, removed incomplete options