This should be merged with date picker and a boolean flag in the constructor. @bkmcleod will take this. Keep date picker function