Massive refactor to support split location/products model, which simplifies filtering GREATLY