Added functional date selector, though still rough code