Added filtering for date, need to do start/end date still