Clayton: changed location list to use a model