#46 progress on BuildModels