diff --git a/Layout/default/Address/Form.php b/Layout/default/Address/Form.php
index fa69a5f51..0f806f067 100644
--- a/Layout/default/Address/Form.php
+++ b/Layout/default/Address/Form.php
@@ -1,8 +1,5 @@
 <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
 
-<div class="wrapper">
-  <div class="container-fluid">
-
     <!-- start page title -->
     <div class="row">
       <div class="col-12">
@@ -183,9 +180,6 @@
       </div>
     </div>
 
-  </div> <!-- end container-fluid -->
-</div>
-<!-- end wrapper -->
 
 <script type="text/javascript">
   $("#parent_id").select2({
diff --git a/Layout/default/Address/Index.php b/Layout/default/Address/Index.php
index e9ec5e2d1..546876b92 100644
--- a/Layout/default/Address/Index.php
+++ b/Layout/default/Address/Index.php
@@ -1,8 +1,5 @@
 <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
 
-<div class="wrapper">
-  <div class="container-fluid">
-
     <!-- start page title -->
     <div class="row">
       <div class="col-12">
@@ -86,8 +83,4 @@
       </div>
     </div>
 
-  </div> <!-- end container-fluid -->
-</div>
-<!-- end wrapper -->
-
 <?php include(realpath(dirname(__FILE__)."/../")."/footer.php"); ?>
\ No newline at end of file
diff --git a/Layout/default/Building/Form.php b/Layout/default/Building/Form.php
index 202b28296..2ea2af35f 100644
--- a/Layout/default/Building/Form.php
+++ b/Layout/default/Building/Form.php
@@ -1,8 +1,4 @@
 <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
-
-<div class="wrapper">
-  <div class="container-fluid">
-
     <!-- start page title -->
     <div class="row">
       <div class="col-12">
@@ -292,10 +288,6 @@
       </div>
     </div>
 
-  </div> <!-- end container-fluid -->
-</div>
-<!-- end wrapper -->
-
 <script type="text/javascript">
   $("#network_id").select2({placeholder: ""});
   $("#pop_id").select2({placeholder: "", allowClear: true,});
diff --git a/Layout/default/Building/Index.php b/Layout/default/Building/Index.php
index 933117160..9e6075c75 100644
--- a/Layout/default/Building/Index.php
+++ b/Layout/default/Building/Index.php
@@ -1,7 +1,6 @@
 <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
 
-<div class="wrapper">
-  <div class="container-fluid">
+
 
     <!-- start page title -->
     <div class="row">
@@ -43,22 +42,128 @@
                 <th></th>
               </tr>
               <?php foreach($buildings as $building): ?>
-              <tr>
-                <td><?=$building->network->name?></td>
-                <td><?=$building->pop->name?></td>
-                <td><?=$building->type->name?></td>
-                <td><?=$building->code?></td>
-                <td><?=$building->oan_id?></td>
-                <td>
+              <tr class="building-list-tr" id="building-<?=$building->id?>">
+                <td onclick="toggleBuilding(<?=$building->id?>)"><?=$building->network->name?></td>
+                <td onclick="toggleBuilding(<?=$building->id?>)"><?=$building->pop->name?></td>
+                <td onclick="toggleBuilding(<?=$building->id?>)"><?=$building->type->name?></td>
+                <td onclick="toggleBuilding(<?=$building->id?>)"><?=$building->code?></td>
+                <td onclick="toggleBuilding(<?=$building->id?>)"><?=$building->oan_id?></td>
+                <td onclick="toggleBuilding(<?=$building->id?>)">
                   <?=$building->street?><br />
                   <?=$building->zip?> <?=$building->city?>
                 </td>
-                <td><?=$building->units?></td>
+                <td onclick="toggleBuilding(<?=$building->id?>)"><?=$building->units?></td>
                 <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
                   <a href="<?=self::getUrl("Building", "edit", ["id" => $building->id])?>"><i class="far fa-edit"  title="Objekt Bearbeiten"></i></a>
                   <a href="<?=self::getUrl("Building", "delete", ["id" => $building->id])?>" class="text-danger" onclick="if(!confirm('Objekt wirklich löschen?')) return false;" title="Objekt Löschen"><i class="fas fa-trash"></i></a>
                 </td>
               </tr>
+              <tr id="building-detail-<?=$building->id?>"  style="display:none; background-color:#fff">
+                <td colspan="8">
+                  
+                  <div class="card">
+                    <div class="card-body">
+                      <h4 class="card-title">Anschlüsse im Objekt <strong><?=$building->code?></strong></h4>
+                      <p>
+                        <?=$building->street?><br />
+                        <?=$building->zip?> <?=$building->city?>
+                      </p>
+                      <div class="card">
+                        <div class="card-body">
+                          
+                          <?php if(is_array($building->terminations) && count($building->terminations)): ?>
+                            <table class="table table-bordered">
+                              <tr>
+                                <th>Code</th>
+                                <th>Bezeichung</th>
+                                <th>Kontakt</th>
+                                <th>Telefon</th>
+                                <th>Email</th>
+                                <th></th>
+                              </tr>
+                              <?php foreach($building->terminations as $term): ?>
+                            
+                                <tr>
+                                  <td><?=$term->code?></td>
+                                  <td>
+
+                                    <span id="term-name-<?=$term->id?>-text"><?=$term->name?></span>
+                                    <div class="input-group" id="term-name-<?=$term->id?>-input" style="display:none">
+                                      <input type="text" class="form-control"  id="term-name-<?=$term->id?>-input" value="<?=$term->name?>" />
+                                      <div class="input-group-append">
+                                        <button type="button" class="btn btn-primary" title="Speichern" onclick="saveTerminationControl(<?=$term->id?>, 'name')"><i class="fas fa-check"></i></button>
+                                        <button type="button" class="btn btn-secondary" title="Abbrechen" onclick="toggleTerminationControl(<?=$term->id?>, 'name')"><i class="fas fa-times"></i></button>
+                                      </div>
+                                    </div>
+                                    <div class="float-right" id="term-name-<?=$term->id?>-edit">
+                                      <i class="far fa-edit text-pink" style="cursor:pointer" title="Bezeichnung Bearbeiten" onclick="toggleTerminationControl(<?=$term->id?>, 'name')"></i>
+                                    </div>
+
+                                  </td>
+                                  <td>
+
+                                    <span id="term-contact-<?=$term->id?>-text"><?=$term->contact?></span>
+                                    <div class="input-group" id="term-contact-<?=$term->id?>-input" style="display:none">
+                                      <input type="text" class="form-control" value="<?=$term->contact?>" />
+                                      <div class="input-group-append">
+                                        <button type="button" class="btn btn-primary" title="Speichern" onclick="saveTerminationControl(<?=$term->id?>, 'contact')"><i class="fas fa-check"></i></button>
+                                        <button type="button" class="btn btn-secondary" title="Abbrechen" onclick="toggleTerminationControl(<?=$term->id?>, 'contact')"><i class="fas fa-times"></i></button>
+                                      </div>
+                                    </div>
+                                    <div class="float-right" id="term-contact-<?=$term->id?>-edit">
+                                      <i class="far fa-edit text-pink" style="cursor:pointer" title="Kontakt Bearbeiten"  onclick="toggleTerminationControl(<?=$term->id?>, 'contact')"></i>
+                                    </div>
+
+                                  </td>
+                                  <td>
+
+                                    <span id="term-phone-<?=$term->id?>-text"><?=$term->phone?></span>
+                                    <div class="input-group" id="term-phone-<?=$term->id?>-input" style="display:none">
+                                      <input type="text" class="form-control"  value="<?=$term->phone?>" />
+                                      <div class="input-group-append">
+                                        <button type="button" class="btn btn-primary" title="Speichern" onclick="saveTerminationControl(<?=$term->id?>, 'phone')"><i class="fas fa-check"></i></button>
+                                        <button type="button" class="btn btn-secondary" title="Abbrechen" onclick="toggleTerminationControl(<?=$term->id?>, 'phone')"><i class="fas fa-times"></i></button>
+                                      </div>
+                                    </div>
+                                    <div class="float-right" id="term-phone-<?=$term->id?>-edit">
+                                      <i class="far fa-edit text-pink" style="cursor:pointer" title="Telefon Bearbeiten" onclick="toggleTerminationControl(<?=$term->id?>, 'phone')"></i>
+                                    </div>
+
+                                  </td>
+                                  <td>
+
+                                    <span id="term-email-<?=$term->id?>-text"><?=$term->email?></span>
+                                    <div class="input-group" id="term-email-<?=$term->id?>-input" style="display:none">
+                                      <input type="text" class="form-control" value="<?=$term->email?>" />
+                                      <div class="input-group-append">
+                                        <button type="button" class="btn btn-primary" title="Speichern" onclick="saveTerminationControl(<?=$term->id?>, 'email')"><i class="fas fa-check"></i></button>
+                                        <button type="button" class="btn btn-secondary" title="Abbrechen" onclick="toggleTerminationControl(<?=$term->id?>, 'email')"><i class="fas fa-times"></i></button>
+                                      </div>
+                                    </div>
+                                    <div class="float-right" id="term-email-<?=$term->id?>-edit">
+                                      <i class="far fa-edit text-pink" style="cursor:pointer" title="Email Bearbeiten" onclick="toggleTerminationControl(<?=$term->id?>, 'email')"></i>
+                                    </div>
+
+                                  </td>
+                                  <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
+                                    <a href="<?=self::getUrl("Building", "delete", ["id" => $term->id])?>" class="text-danger" onclick="if(!confirm('Objekt wirklich löschen?')) return false;" title="Objekt Löschen"><i class="fas fa-trash"></i></a>
+                                  </td>
+                                </tr>
+                            
+                              <?php endforeach; ?>
+                            </table>
+                          <?php endif; ?>
+                          
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  
+                </td>
+              </tr>
+              <tr style="display:none;">
+                <td colspan="3"></td>
+              </tr>
               <?php endforeach; ?>
             </table>
           </div>
@@ -67,8 +172,56 @@
       </div>
     </div>
 
-  </div> <!-- end container-fluid -->
-</div>
-<!-- end wrapper -->
+
+
+<script type="text/javascript">
+  function toggleBuilding(id) {
+    $('#building-detail-' + id).toggle();
+    if($('#building-detail-' + id).is(":hidden")) {
+      $('#building-' + id).removeClass("table-info");
+      $('#building-' + id).removeClass("text-info");
+    } else {
+      $('#building-' + id).addClass("text-info");
+      $('#building-' + id).addClass("table-info");
+    }
+  }
+
+  function toggleTerminationControl(id, type) {
+    $("#term-" + type + "-" + id + "-text").toggle();
+    $("#term-" + type + "-" + id + "-input").toggle();
+    $("#term-" + type + "-" + id + "-edit").toggle();
+  }
+
+  function saveTerminationControl(id, type) {
+    if(!Number.isInteger(id) || id < 1) {
+      return false;
+    }
+    
+    var value = $("#term-" + type + "-" + id + "-input input[type=text]").val();
+    
+    $.post("<?=self::getUrl("Termination","Api")?>",
+    {
+      'do': "setValue",
+      id: id,
+      type: type,
+      value: value
+    },
+    function(success) {
+      if(success.status == "OK") {
+        $("#term-" + type + "-" + id + "-text").text(value);
+      } else {
+        console.log("error saving (" + type + ", '" + value + "')");
+      }
+      
+      toggleTerminationControl(id, type);
+    },
+    'json');
+    
+    
+    
+  }
+
+</script>
+  
 
 <?php include(realpath(dirname(__FILE__)."/../")."/footer.php"); ?>
\ No newline at end of file
diff --git a/Layout/default/Dashboard/Index.php b/Layout/default/Dashboard/Index.php
index 38cd090f4..5af966692 100644
--- a/Layout/default/Dashboard/Index.php
+++ b/Layout/default/Dashboard/Index.php
@@ -1,8 +1,5 @@
 <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
 
-<div class="wrapper">
-  <div class="container-fluid">
-
     <!-- start page title -->
     <div class="row">
       <div class="col-12">
@@ -20,8 +17,4 @@
     <!-- end page title --> 
 
 
-  </div> <!-- end container-fluid -->
-</div>
-<!-- end wrapper -->
-
 <?php include(realpath(dirname(__FILE__)."/../")."/footer.php"); ?>
\ No newline at end of file
diff --git a/Layout/default/Network/Form.php b/Layout/default/Network/Form.php
index ae71ad3ab..729635309 100644
--- a/Layout/default/Network/Form.php
+++ b/Layout/default/Network/Form.php
@@ -1,8 +1,5 @@
 <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
 
-<div class="wrapper">
-  <div class="container-fluid">
-
     <!-- start page title -->
     <div class="row">
       <div class="col-12">
@@ -82,10 +79,6 @@
       </div>
     </div>
 
-  </div> <!-- end container-fluid -->
-</div>
-<!-- end wrapper -->
-
 <script type="text/javascript">
   $("#parent_id").select2({
     allowClear: true,
diff --git a/Layout/default/Network/Index.php b/Layout/default/Network/Index.php
index a65ac2b12..faa83ab59 100644
--- a/Layout/default/Network/Index.php
+++ b/Layout/default/Network/Index.php
@@ -1,8 +1,5 @@
 <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
 
-<div class="wrapper">
-  <div class="container-fluid">
-
     <!-- start page title -->
     <div class="row">
       <div class="col-12">
@@ -260,10 +257,6 @@
       </div>
     </div>
 
-  </div> <!-- end container-fluid -->
-</div>
-<!-- end wrapper -->
-
 <script type="text/javascript">
   function toggleNetwork(id) {
     $('#network-detail-' + id).toggle();
diff --git a/Layout/default/Pop/Form.php b/Layout/default/Pop/Form.php
index 9c610e11b..57ca7ab26 100644
--- a/Layout/default/Pop/Form.php
+++ b/Layout/default/Pop/Form.php
@@ -1,8 +1,5 @@
 <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
 
-<div class="wrapper">
-  <div class="container-fluid">
-
     <!-- start page title -->
     <div class="row">
       <div class="col-12">
@@ -132,10 +129,6 @@
       </div>
     </div>
 
-  </div> <!-- end container-fluid -->
-</div>
-<!-- end wrapper -->
-
 <script type="text/javascript">
   $("#parent_id").select2({
     allowClear: true,
diff --git a/Layout/default/Product/Form.php b/Layout/default/Product/Form.php
index 7a2f50b96..6c000f62c 100644
--- a/Layout/default/Product/Form.php
+++ b/Layout/default/Product/Form.php
@@ -1,8 +1,5 @@
 <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
 
-<div class="wrapper">
-  <div class="container-fluid">
-
     <!-- start page title -->
     <div class="row">
       <div class="col-12">
@@ -239,9 +236,6 @@
       </div>
     </div>
 
-  </div> <!-- end container-fluid -->
-</div>
-<!-- end wrapper -->
 
 <script type="text/javascript">
   $("#productgroup_id").select2({
diff --git a/Layout/default/Product/Index.php b/Layout/default/Product/Index.php
index d68c0692b..074c07b72 100644
--- a/Layout/default/Product/Index.php
+++ b/Layout/default/Product/Index.php
@@ -1,8 +1,5 @@
 <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
 
-<div class="wrapper">
-  <div class="container-fluid">
-
     <!-- start page title -->
     <div class="row">
       <div class="col-12">
@@ -68,8 +65,4 @@
       </div>
     </div>
 
-  </div> <!-- end container-fluid -->
-</div>
-<!-- end wrapper -->
-
 <?php include(realpath(dirname(__FILE__)."/../")."/footer.php"); ?>
\ No newline at end of file
diff --git a/Layout/default/Producttech/Form.php b/Layout/default/Producttech/Form.php
index 7d507d2b5..9fb1ce737 100644
--- a/Layout/default/Producttech/Form.php
+++ b/Layout/default/Producttech/Form.php
@@ -1,8 +1,4 @@
 <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
-
-<div class="wrapper">
-  <div class="container-fluid">
-
     <!-- start page title -->
     <div class="row">
       <div class="col-12">
@@ -183,9 +179,6 @@
       </div>
     </div>
 
-  </div> <!-- end container-fluid -->
-</div>
-<!-- end wrapper -->
 
 <script type="text/javascript">
   $("#productgroup_id").select2({
diff --git a/Layout/default/Producttech/Index.php b/Layout/default/Producttech/Index.php
index 084878958..f5045495b 100644
--- a/Layout/default/Producttech/Index.php
+++ b/Layout/default/Producttech/Index.php
@@ -1,8 +1,5 @@
 <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
 
-<div class="wrapper">
-  <div class="container-fluid">
-
     <!-- start page title -->
     <div class="row">
       <div class="col-12">
@@ -55,8 +52,4 @@
       </div>
     </div>
 
-  </div> <!-- end container-fluid -->
-</div>
-<!-- end wrapper -->
-
 <?php include(realpath(dirname(__FILE__)."/../")."/footer.php"); ?>
\ No newline at end of file
diff --git a/Layout/default/User/Form.php b/Layout/default/User/Form.php
index a0c841a07..cf9f1b980 100644
--- a/Layout/default/User/Form.php
+++ b/Layout/default/User/Form.php
@@ -3,9 +3,6 @@
 ?>
 <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
 
-<div class="wrapper">
-  <div class="container-fluid">
-
     <!-- start page title -->
     <div class="row">
       <div class="col-12">
@@ -78,10 +75,6 @@
         </div>
       </div>
     </div>
-  </div>
-  <!-- /.container-fluid -->
-</div>
-    <!-- /.content -->
 
 <script type="text/javascript">
   $("#address_id").select2({
diff --git a/Layout/default/User/Index.php b/Layout/default/User/Index.php
index a81907d2f..81676e373 100644
--- a/Layout/default/User/Index.php
+++ b/Layout/default/User/Index.php
@@ -3,9 +3,6 @@
 ?>
 <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
 
-<div class="wrapper">
-  <div class="container-fluid">
-    
     <!-- start page title -->
     <div class="row">
       <div class="col-12">
@@ -74,11 +71,6 @@
     </div>
         
     
-  </div>
-  <!-- /.container-fluid -->
-</div>
-<!-- /.content -->
-
   <!-- Control Sidebar -->
   <aside class="control-sidebar control-sidebar-dark">
     <!-- Control sidebar content goes here -->
diff --git a/Layout/default/footer.php b/Layout/default/footer.php
index bc40d9049..fb5bd4d97 100644
--- a/Layout/default/footer.php
+++ b/Layout/default/footer.php
@@ -1,3 +1,7 @@
+  </div> <!-- end container-fluid -->
+</div>
+<!-- end wrapper -->
+
 <!-- Footer Start -->
         <footer class="footer">
             <div class="container-fluid">
diff --git a/Layout/default/header.php b/Layout/default/header.php
index 0384de155..0b22cb53a 100644
--- a/Layout/default/header.php
+++ b/Layout/default/header.php
@@ -36,4 +36,55 @@
           <?php include(realpath(dirname(__FILE__)."/")."/topbar.php"); ?>
           <?php include(realpath(dirname(__FILE__)."/")."/menu.php"); ?>
         </header>
-        <!-- End Navigation Bar-->
\ No newline at end of file
+        <!-- End Navigation Bar-->
+        
+  
+<div class="wrapper">
+  <div class="container-fluid">
+        
+    <?php if(isset($_flash_set) && $_flash_set == true): ?>
+      <?php if(isset($mfError) && !empty($mfError)): ?>
+        <div class="row mr-1">
+          <div class="col-md-1"></div>
+          <div class="col-md-10 alert alert-danger alert-dismissible">
+            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+            <h5><i class="icon fas fa-ban"></i> Fehler</h5>
+            <?=$mfError?>
+          </div>
+        </div>
+      <?php endif; ?>
+
+      <?php if(isset($mfWarning) && !empty($mfWarning)): ?>
+        <div class="row mr-1">
+          <div class="col-md-1"></div>
+          <div class="col-md-10 alert alert-warning alert-dismissible">
+            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+            <h5><i class="icon fas fa-exclamation-triangle"></i> Warnung</h5>
+            <?=$mfWarning?>
+          </div>
+        </div>
+      <?php endif; ?>
+
+      <?php if(isset($mfInfo) && !empty($mfInfo)): ?>
+        <div class="row mr-1">
+          <div class="col-md-1"></div>
+          <div class="col-md-10 alert alert-info alert-dismissible">
+            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+            <h5><i class="icon fas fa-info"></i> Info</h5>
+            <?=$mfInfo?>
+          </div>
+        </div>
+      <?php endif; ?>
+
+      <?php if(isset($mfSuccess) && !empty($mfSuccess)): ?>
+        <div class="row mr-1">
+          <div class="col-md-1"></div>
+          <div class="col-md-10 alert alert-success alert-dismissible">
+            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+            <h5><i class="icon fas fa-check"></i> Erfolgreich</h5>
+            <?=$mfSuccess?>
+          </div>
+        </div>
+      <?php endif; ?>
+
+    <?php endif; ?>
\ No newline at end of file
diff --git a/application/Building/Building.php b/application/Building/Building.php
index 5f81dfcba..1f17275e7 100644
--- a/application/Building/Building.php
+++ b/application/Building/Building.php
@@ -8,38 +8,7 @@ class Building extends mfBaseModel {
   private $type;
   private $status;
   private $pipeworker;
-  
-  public function getProperty($name) {
-    if($this->$name == null) {
-      
-      if($name == "type") {
-        $this->type = new Buildingtype($this->type_id);
-        return $this->type;
-      }
-      
-      if($name == "status") {
-        $this->status = new Buildingstatus($this->status_id);
-        return $this->status;
-      }
-      
-      if($name == "pipeworker") {
-        $this->pipeworker = new Address($this->pipeworker_id);
-        return $this->pipeworker;
-      }
-      
-      $classname = ucfirst($name);
-      $idfield = $name."_id";
-      $this->$name = new $classname($this->$idfield);
-      
-      if($this->$name->id) {
-        return $this->$name;
-      } else {
-        return null;
-      }
-    }
-    
-    return $this->$name;
-  }
+  private $terminations;
   
   public function getNewObjectCode() {
     if(!$this->zip) {
@@ -116,4 +85,41 @@ class Building extends mfBaseModel {
     return $Gridcell;
   }
   
+  public function getProperty($name) {
+    if($this->$name == null) {
+      
+      if($name == "type") {
+        $this->type = new Buildingtype($this->type_id);
+        return $this->type;
+      }
+      
+      if($name == "status") {
+        $this->status = new Buildingstatus($this->status_id);
+        return $this->status;
+      }
+      
+      if($name == "pipeworker") {
+        $this->pipeworker = new Address($this->pipeworker_id);
+        return $this->pipeworker;
+      }
+      
+      if($name == "terminations") {
+        $this->terminations = TerminationModel::search(['building_id' => $this->id]);
+        return $this->terminations;
+      }
+      
+      $classname = ucfirst($name);
+      $idfield = $name."_id";
+      $this->$name = new $classname($this->$idfield);
+      
+      if($this->$name->id) {
+        return $this->$name;
+      } else {
+        return null;
+      }
+    }
+    
+    return $this->$name;
+  }
+  
 }
\ No newline at end of file
diff --git a/application/Building/BuildingController.php b/application/Building/BuildingController.php
index e45ba76fd..7a120eca8 100644
--- a/application/Building/BuildingController.php
+++ b/application/Building/BuildingController.php
@@ -140,6 +140,31 @@ class BuildingController extends mfBaseController {
       $building->save();
     }
     
+    // Anschlüsse anlegen
+    if($building->units > 0) {
+      for($i = 1; $i <= $building->units; $i++) {
+        $data = [];
+        $data['building_id'] = $building->id;
+        $data['code'] = $building->code . "." . sprintf("%03d", $i);
+        
+        if($building->units == 1) {
+          $data['contact'] = $building->contact;
+          $data['phone'] = $building->phone;
+          $data['email'] = $building->email;
+        }
+        
+        if($building->lineworker_id) {
+          $data['lineworker_id'] = $building->lineworker_id;
+        }
+        if($building->oan_id) {
+          $data['oan_id'] = $building->oan_id. "." . sprintf("%03d", $i);
+        }
+        
+        $term = TerminationModel::create($data);
+        $term->save();
+      }
+    }
+    
     
     $this->layout()->setFlash("Objekt erfolgreich gespeichert.", "success");
     $this->redirect("Building", "Edit", ['id' => $new_id]);
diff --git a/application/Termination/Termination.php b/application/Termination/Termination.php
new file mode 100644
index 000000000..fcf094e79
--- /dev/null
+++ b/application/Termination/Termination.php
@@ -0,0 +1,29 @@
+<?php
+
+class Termination extends mfBaseModel {
+  protected $forcestr = ['phone','email','note'];
+  
+  private $building;
+  private $status;
+  private $lineworker;
+  private $creator;
+  private $editor;
+  
+  public function getProperty($name) {
+    if($this->$name == null) {
+      
+      $classname = ucfirst($name);
+      $idfield = $name."_id";
+      $this->$name = new $classname($this->$idfield);
+      
+      if($this->$name->id) {
+        return $this->$name;
+      } else {
+        return null;
+      }
+    }
+    
+    return $this->$name;
+  }
+
+}
\ No newline at end of file
diff --git a/application/Termination/TerminationController.php b/application/Termination/TerminationController.php
new file mode 100644
index 000000000..d4331f35c
--- /dev/null
+++ b/application/Termination/TerminationController.php
@@ -0,0 +1,69 @@
+<?php
+
+class TerminationController extends mfBaseController {
+  
+  protected function init() {
+    $this->needlogin=true;
+    $me = new User();
+    $me->loadMe();
+    $this->me = $me;
+    $this->layout()->set("me",$me);
+    
+    if(!$me->isAdmin() && !$me->is("netowner") && !$me->is("lineplanner") && !$me->is("lineworker")) {
+      $this->redirect("Dashboard");
+    }
+  }
+  
+  
+  protected function apiAction() {
+    $do = $this->request->do;
+    $data = [];
+    
+    switch($do) {
+      case "setValue":
+        $return = $this->setValueApi();
+        break;
+      default:
+        $return = false;
+    }
+    
+    if(!is_array($return) || !count($return)) {
+      $data = ["status" => "error"];
+      $this->returnJson($data);
+    }
+    $data['status'] = "OK";
+    $data['result'] = $return;
+    $this->returnJson($data);
+  }
+  
+  private function setValueApi() {
+    $term_id = $this->request->id;
+    $field = $this->request->type;
+    $value = $this->db->escape($this->request->value);
+    
+    if(!is_numeric($term_id) || $term_id < 1) {
+      $this->log->debug(__FILE__.": id not a number");
+      return false;
+    }
+    
+    if(!in_array($field, ["name","contact","phone","email"])) {
+      $this->log->debug(__FILE__.": invalid field");
+      return false;
+    }
+    
+    $term = new Termination($term_id);
+    if(!$term->id) {
+      $this->log->debug(__FILE__.": no termination");
+      return false;
+    }
+    
+    $term->$field = $value;
+    
+    if(!$term->save()) {
+      $this->log->debug(__FILE__.": error saving");
+      return false;
+    }
+    
+    return ["msg" => "Saved successfully"];
+  }
+}
\ No newline at end of file
diff --git a/application/Termination/TerminationModel.php b/application/Termination/TerminationModel.php
new file mode 100644
index 000000000..b05e0a256
--- /dev/null
+++ b/application/Termination/TerminationModel.php
@@ -0,0 +1,139 @@
+<?php
+
+class TerminationModel {
+  public $building_id = null;
+  public $status_id = null;
+  public $lineworker_id = null;
+  public $name = null;
+  public $code = null;
+  public $oan_id = null;
+  public $rimo_id = null;
+  public $contact = null;
+  public $phone = null;
+  public $email = null;
+  
+  public $create_by = null;
+  public $edit_by = null;
+  public $create = null;
+  public $edit = null;
+
+  public static function create(Array $data) {
+    $model = new Termination();
+    
+    foreach($data as $field => $value) {
+      if(property_exists(get_called_class(), $field)) {
+        $model->$field = $value;
+      }
+    }
+    
+    if(!$model->status_id) {
+      $model->status_id = 1;
+    }
+    
+    $me = new User();
+    $me->loadMe();
+
+    if($model->create_by === null) {
+      $model->create_by = $me->id;
+    }
+    if($model->edit_by === null) {
+      $model->edit_by = $me->id;
+    }
+    
+    return $model;
+  }
+  
+  public static function getOne($id) {
+    if(!is_numeric($id) || !$id) {
+      throw new Exception("Invalid number", 400);
+    }
+    $item = [];
+    $db = FronkDB::singleton();
+    
+    $res = $db->select("Termination", "*", "id=$id LIMIT 1");
+    if($db->num_rows($res)) {
+      $data = $db->fetch_object($res);
+      $item = new Termination($data);
+    }
+    return $item;
+  }
+  
+  public static function getAll() {
+    $items = [];
+    
+    $db = FronkDB::singleton();
+    
+    $res = $db->select("Termination", "*", "1=1 ORDER BY code");
+    if($db->num_rows($res)) {
+      while($data = $db->fetch_object($res)) {
+        $items[] = new Termination($data);
+      }
+    }
+    return $items;
+    
+  }
+  
+  public static function search($filter) {
+    $items = [];
+    $db = FronkDB::singleton();
+    
+    $where = self::getSqlFilter($filter);
+    $sql = "SELECT Termination.* FROM Termination
+            LEFT JOIN Building ON (Building.id = Termination.building_id)
+            LEFT JOIN Terminationstatus ON (Terminationstatus.id = Termination.status_id)
+            WHERE $where
+            ORDER BY code
+           ";
+    
+    $res = $db->query($sql);
+    if($db->num_rows($res)) {
+      while($data = $db->fetch_object($res)) {
+        $items[] = new Termination($data);
+      }
+    }
+    return $items;
+  }
+  
+  private function getSqlFilter($filter) {
+    $where = "1=1 ";
+  
+    if(array_key_exists("building_id", $filter)) {
+      $building_id = $filter['building_id'];
+      
+      if(is_numeric($building_id) && $building_id > 0) {
+        $where .= " AND building_id = $building_id";
+      }
+    }
+    
+    
+    if(array_key_exists("status", $filter)) {
+      if(in_array(substr($filter['status'], 1, 2), ["<=", ">="])) {
+        $op = substr($filter['status'], 1, 2);
+        $status = substr($filter['status'], 3);
+      } elseif(in_array(substr($filter['status'], 1, 1), ["<", ">"])) {
+        $op = substr($filter['status'], 1, 1);
+        $status = substr($filter['status'], 2);
+      } else {
+        $op = "=";
+        $status = $filter['status'];
+      }
+      
+      if(is_numeric($status)) {
+        $where .= " AND Terminationstatus.code $op $status";
+      } else {
+        // get code of statusname
+        $code = Terminationstatus::getOne(["name" => $status]);
+        if($code) {
+          $status = FronkDB::singleton()->escape($status);
+          $where .= " AND Terminationstatus.code $op '$status'";
+        }
+        
+      }
+    }
+    
+    return $where;
+    
+  }
+
+  
+}
\ No newline at end of file
diff --git a/application/Terminationstatus/Terminationstatus.php b/application/Terminationstatus/Terminationstatus.php
new file mode 100644
index 000000000..0d970a2fd
--- /dev/null
+++ b/application/Terminationstatus/Terminationstatus.php
@@ -0,0 +1,5 @@
+<?php
+
+class Terminationstatus extends mfBaseModel {
+  
+}
\ No newline at end of file
diff --git a/application/Terminationstatus/TerminationstatusModel.php b/application/Terminationstatus/TerminationstatusModel.php
new file mode 100644
index 000000000..8951e7dd6
--- /dev/null
+++ b/application/Terminationstatus/TerminationstatusModel.php
@@ -0,0 +1,95 @@
+<?php
+
+class TerminationstatusModel {
+  public $code = null;
+  public $name = null;
+  
+  public $create_by = null;
+  public $edit_by = null;
+  public $create = null;
+  public $edit = null;
+
+  public static function create(Array $data) {
+    $model = new Terminationstatus();
+    
+    foreach($data as $field => $value) {
+      if(property_exists(get_called_class(), $field)) {
+        $model ->$field = $value;
+      }
+    }
+    
+    $me = new User();
+    $me->loadMe();
+
+    if($model->create_by === null) {
+      $model->create_by = $me->id;
+    }
+    if($model->edit_by === null) {
+      $model->edit_by = $me->id;
+    }
+    
+    return $model;
+  }
+  
+  public static function getOne($id) {
+    if(!is_numeric($id) || !$id) {
+      throw new Exception("Invalid number", 400);
+    }
+    $item = [];
+    $db = FronkDB::singleton();
+    
+    $res = $db->select("Terminationstatus", "*", "id=$id LIMIT 1");
+    if($db->num_rows($res)) {
+      $data = $db->fetch_object($res);
+      $item = new Terminationstatus($data);
+    }
+    return $item;
+  }
+  
+  public static function getAll() {
+    $items = [];
+    
+    $db = FronkDB::singleton();
+    
+    $res = $db->select("Terminationstatus", "*", "1=1 ORDER BY code,name");
+    if($db->num_rows($res)) {
+      while($data = $db->fetch_object($res)) {
+        $items[] = new Terminationstatus($data);
+      }
+    }
+    return $items;
+    
+  }
+  
+  public static function search($filter) {
+    $items = [];
+    $db = FronkDB::singleton();
+    
+    $where = self::getSqlFilter($filter);
+    $res = $db->select("Terminationstatus", "*", $where);
+    if($db->num_rows($res)) {
+      while($data = $db->fetch_object($res)) {
+        $items[] = new Terminationstatus($data);
+      }
+    }
+    return $items;
+  }
+  
+  private function getSqlFilter($filter) {
+    $where = "1=1 ";
+    
+    if(array_key_exists("code", $filter)) {
+      $code = FronkDB::singleton()->escape($filter['code']);
+      $where .= " AND code='$code'";
+    }
+    
+    if(array_key_exists("name", $filter)) {
+      $name = FronkDB::singleton()->escape($filter['name']);
+      $where .= " AND name='$name'";
+    }
+    
+    //var_dump($filter, $where);exit;
+    return $where;
+  }
+  
+}
\ No newline at end of file
diff --git a/contrib/migrations/2021-07-22-termination b/contrib/migrations/2021-07-22-termination
new file mode 100644
index 000000000..640d5f88a
--- /dev/null
+++ b/contrib/migrations/2021-07-22-termination
@@ -0,0 +1,29 @@
+CREATE TABLE `Termination` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `building_id` int(11) NOT NULL,
+  `status_id` int(11) NOT NULL,
+  `lineworker_id` int(11) DEFAULT NULL,
+  `name` varchar(255) COLLATE utf8mb4_unicode_520_ci DEFAULT NULL,
+  `code` varchar(20) COLLATE utf8mb4_unicode_520_ci NOT NULL,
+  `oan_id` varchar(255) COLLATE utf8mb4_unicode_520_ci DEFAULT NULL,
+  `rimo_id` varchar(255) COLLATE utf8mb4_unicode_520_ci DEFAULT NULL,
+  `contact` varchar(1024) COLLATE utf8mb4_unicode_520_ci DEFAULT NULL,
+  `phone` varchar(1024) COLLATE utf8mb4_unicode_520_ci DEFAULT NULL,
+  `email` varchar(1024) COLLATE utf8mb4_unicode_520_ci DEFAULT NULL,
+  `create_by` int(11) NOT NULL,
+  `edit_by` int(11) NOT NULL,
+  `create` int(11) NOT NULL,
+  `edit` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci;
+
+CREATE TABLE `Terminationstatus` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `code` int(11) NOT NULL,
+  `name` varchar(255) COLLATE utf8mb4_unicode_520_ci NOT NULL,
+  `create_by` int(11) NOT NULL,
+  `edit_by` int(11) NOT NULL,
+  `create` int(11) NOT NULL,
+  `edit` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci;
\ No newline at end of file
diff --git a/public/assets/css/thetool.css b/public/assets/css/thetool.css
index 7d6e8b562..3cc550672 100644
--- a/public/assets/css/thetool.css
+++ b/public/assets/css/thetool.css
@@ -1,3 +1,7 @@
+.hidden {
+  display:none;
+}
+
 .has-sub-submenu {
   border-bottom: 1px solid #eee;
 }