removing west coast hack
refactoring to switch
clean up
Adding support for start_date and end_date parameters