Tweaked the UI and model objects to use LocationCollection