diff --git a/repos/os/src/hoitaja/habitat.cc b/repos/os/src/hoitaja/habitat.cc
new file mode 100644
index 0000000000..d82e2576e0
--- /dev/null
+++ b/repos/os/src/hoitaja/habitat.cc
@@ -0,0 +1,119 @@
+#include "habitat.h"
+#include <sandbox/utils.h>
+
+::Sandbox::Child &Hoitaja::Habitat::create_child(Genode::Xml_node const &start_node)
+{
+    if (_affinity_space.constructed() && !_core_allocator.constructed())
+        _core_allocator.construct(*_affinity_space, _prio_levels);
+
+    Genode::Affinity::Location allocation =  _core_allocator->allocate_cores_for_cell(start_node);
+
+
+
+    if (allocation.width() < 1) {
+        Genode::error("failed to create child ", start_node.attribute_value("name", Child_policy::Name()), ": not enough CPU cores left.");
+        throw ::Sandbox::Start_model::Factory::Creation_failed();
+    }
+
+    // Allocate `cores_share` cores from the Core Allocator and set the childs affinity accordingly
+    // TODO: Implement core allocation
+
+	try {
+		Hoitaja::Cell &child = *new (_heap)
+			Hoitaja::Cell(_env, _heap, *_verbose,
+			      Child::Id { ++_child_cnt }, _state_reporter,
+			      start_node, *this, *this, _children, *this, *this, *this, *this,
+			      _prio_levels, _effective_affinity_space(), allocation,
+			      _parent_services, _child_services, _local_services, _habitat_handler);
+        _children.insert(static_cast<::Sandbox::Child *>(&child));
+    
+		maintain_cells();
+
+        _avail_cpu.percent -= min(_avail_cpu.percent, child.cpu_quota().percent);
+
+		if (start_node.has_sub_node("provides"))
+			_server_appeared_or_disappeared = true;
+
+		_state_report_outdated = true;
+
+		return static_cast<::Sandbox::Child&>(child);
+	}
+	catch (Rom_connection::Rom_connection_failed) {
+		/*
+		 * The binary does not exist. An error message is printed
+		 * by the Rom_connection constructor.
+		 */
+	}
+	catch (Out_of_ram) {
+		warning("memory exhausted during child creation"); }
+	catch (Out_of_caps) {
+		warning("local capabilities exhausted during child creation"); }
+	catch (Child::Missing_name_attribute) {
+		warning("skipped startup of nameless child"); }
+	catch (Region_map::Region_conflict) {
+		warning("failed to attach dataspace to local address space "
+		        "during child construction"); }
+	catch (Region_map::Invalid_dataspace) {
+		warning("attempt to attach invalid dataspace to local address space "
+		        "during child construction"); }
+	catch (Service_denied) {
+		warning("failed to create session during child construction"); }
+
+	throw ::Sandbox::Start_model::Factory::Creation_failed();
+}
+
+void Hoitaja::Habitat::_destroy_abandoned_children()
+{
+	_children.for_each_child([&] (Child &child) {
+
+		if (!child.abandoned())
+			return;
+
+		/* make the child's services unavailable */
+		child.destroy_services();
+		child.close_all_sessions();
+		_state_report_outdated = true;
+
+		/* destroy child once all environment sessions are gone */
+		if (child.env_sessions_closed()) {
+			_core_allocator->free_cores_from_cell(static_cast<Hoitaja::Cell &>(child));
+			_children.remove(&child);
+
+			Cpu_quota const child_cpu_quota = child.cpu_quota();
+
+			destroy(_heap, &child);
+
+			/* replenish available CPU quota */
+			_avail_cpu.percent       += child_cpu_quota.percent;
+			_transferred_cpu.percent -= min(_transferred_cpu.percent,
+			                                child_cpu_quota.percent);
+		}
+	});
+	
+	/* We might have formerly occupied resources again now, so redistribute them */
+	maintain_cells();
+}
+
+void Hoitaja::Habitat::maintain_cells()
+{
+	int xpos = _affinity_space->total();
+	_children.for_each_child([&](Child &child)
+							 { 
+                                log(child.name(), " ram: ", child.ram_quota());
+                                Cell &cell = static_cast<Cell&>(child);
+                                _core_allocator->update(cell, &xpos); });
+}
+
+void Hoitaja::Habitat::update(Cell &cell)
+{
+	if (cell._exited) {
+		if (cell._exit_value != 0)
+			Genode::error(cell.name(), " exited with exit status ", cell._exit_value);
+		
+		_children.remove(static_cast<Sandbox::Child *>(&cell));
+		_core_allocator->free_cores_from_cell(cell);
+
+		/* Update resource allocations, as there are new resources available */	
+		maintain_cells();
+	}
+}
\ No newline at end of file
diff --git a/repos/os/src/hoitaja/habitat.h b/repos/os/src/hoitaja/habitat.h
index 09f1996bae..7a58b658fb 100644
--- a/repos/os/src/hoitaja/habitat.h
+++ b/repos/os/src/hoitaja/habitat.h
@@ -11,24 +11,36 @@
 #include <base/service.h>
 #include <base/heap.h>
 
+#include <util/reconstructible.h>
+
+/* Hoitaja includes */
+#include <core_allocator.h>
+#include <cell.h>
+#include <state_handler.h>
+
+#pragma once
 namespace Hoitaja {
     class Habitat;
     using namespace Genode;
 }
-class Hoitaja::Habitat : Sandbox::Library
+struct Hoitaja::Habitat : public Sandbox::Library
 {
-    
-    private:
+    public:
+
         friend class Genode::Sandbox::Local_service_base;
 
+        State_handler &_habitat_handler;
+
         Heap _heap;
 
+        Genode::Constructible<Hoitaja::Core_allocator> _core_allocator;
+
         Registry<Genode::Sandbox::Local_service_base>
             _local_services{};
 
-    public:
         void apply_config(Xml_node const &config) override {
             log("Hoitaja is applying new config.");
+
             Sandbox::Library::apply_config(config);
         }
 
@@ -39,8 +51,19 @@ class Hoitaja::Habitat : Sandbox::Library
 
         void maintain_cells();
 
-        Habitat(Env &env, Genode::Sandbox::State_handler &handler)
-            : Sandbox::Library(env, _heap, _local_services, handler), _heap(env.ram(), env.rm())
+        /**
+         * @brief Update cell's resource allocations
+         * 
+         * @param cell whose resource allocations needs updating
+         */
+        void update(Cell &cell);
+
+        Habitat(Env &env, State_handler &habitat_handler, Genode::Sandbox::State_handler &handler)
+            : Sandbox::Library(env, _heap, _local_services, handler), _habitat_handler(habitat_handler), _heap(env.ram(), env.rm()), _core_allocator()
         {
         }
+
+        Sandbox::Child &create_child(Xml_node const &) override;
+
+        void _destroy_abandoned_children() override;
 };
\ No newline at end of file