Reverting some changes I thought were needed.
Brand new schedule by location short code is complete!