Added Store Locator and reworked API to use more inheritance