Added tables for data, and date selection, untested