getModels functions merged
Mid-work, commit to transfer to mac