diff --git a/work/week14/particle-pybind/starting_point/pypart_pybind.cpp b/work/week14/particle-pybind/starting_point/pypart_pybind.cpp
index e5b0521..1d04bbe 100644
--- a/work/week14/particle-pybind/starting_point/pypart_pybind.cpp
+++ b/work/week14/particle-pybind/starting_point/pypart_pybind.cpp
@@ -1,48 +1,77 @@
 #include <functional>
 #include <iostream>
 #include <pybind11/pybind11.h>
 
 #include "my_types.hh"
+#include "system_evolution.cc"
+#include "system.cc"
 #include "csv_writer.cc"
 #include "particles_factory_interface.cc"
 #include "ping_pong_balls_factory.cc"
 #include "material_points_factory.cc"
 #include "planets_factory.cc"
 #include "compute_temperature.cc"
 
 namespace py = pybind11;
 
 PYBIND11_MODULE(pypart, m) {
 
+// Wrap the SystemEvolution class
+py::class_<System>(m, "System")
+      .def(py::init<>()) // constructor
+      ;
+
+// Wrap the SystemEvolution class
+py::class_<SystemEvolution>(m, "SystemEvolution")
+      // .def(py::init<std::unique_ptr<System>>(),
+      // py::arg("system") = system)       // with a default) // constructor
+      ;
+
 // Wrap the ParticlesFactoryInterface class
-  py::class_<ParticlesFactoryInterface>(m, "ParticlesFactoryInterface")
+py::class_<ParticlesFactoryInterface>(m, "ParticlesFactoryInterface")
       // .def(py::init<>()) // constructor
       .def("getInstance", &ParticlesFactoryInterface::getInstance) // getInstance method
+      .def("createSimulation",(&ParticlesFactoryInterface::createSimulation)) // overloading with int
+      ;
+
+// Wrap the PlanetsFactory class
+py::class_<PlanetsFactory, ParticlesFactoryInterface>(m, "MaterialPointsFactory")
+      // .def(py::init<>()) // constructor
+      .def("getInstance", &PlanetsFactory::getInstance) // getInstance method
+      
+      .def("createSimulation", &PlanetsFactory::createSimulation) // overloading with int
+      ;
+
+// Wrap the PingPongBallsFactory class
+py::class_<PingPongBallsFactory, ParticlesFactoryInterface>(m, "MaterialPointsFactory")
+      // .def(py::init<>()) // constructor
+      .def("getInstance", &PingPongBallsFactory::getInstance) // getInstance method
+      
+      .def("createSimulation", &PingPongBallsFactory::createSimulation) // overloading with int
       ;
 
 // Wrap the MaterialPointsFactory class
-  py::class_<MaterialPointsFactory, ParticlesFactoryInterface>(m, "MaterialPointsFactory")
+py::class_<MaterialPointsFactory, ParticlesFactoryInterface>(m, "MaterialPointsFactory")
       // .def(py::init<>()) // constructor
       .def("getInstance", &MaterialPointsFactory::getInstance) // getInstance method
       
-      .def("createSimulation",
-           py::overload_cast<const std::string &, Real>(&MaterialPointsFactory::createSimulation)) // overloading with int
       // .def("createSimulation",
-      //      py::overload_cast<const std::string&, Real, py::function>(
-      //          &MaterialPointsFactory::createSimulation, py::const_)) // overloading with const
+      //      py::overload_cast<const std::string &, Real>(&MaterialPointsFactory::createSimulation)) // overloading with int
+      .def("createSimulation",
+           py::overload_cast<const std::string &, Real, py::function>(&MaterialPointsFactory::createSimulation<py::function>)) // overloading with const
       ;
 
 // //Make a shared Compute Method
 // py::class_<Compute, std::shared_ptr<Compute>>(m, "Compute");
 
 // //Creates the ComputeTemeprature class and its functions
 // py::class_<ComputeTemperature, Compute>(m, "ComputeTemperature")
 //       .def(py::init<>()) // constructor)
 //       .def("getConductivity", &ComputeTemperature::getConductivity) // method only in Dog;
 //       .def("getCapacity", &ComputeTemperature::getCapacity)
 //       .def("getDensity", &ComputeTemperature::getDensity)
 //       .def("getL", &ComputeTemperature::getL)
 //       .def("getDeltat", &ComputeTemperature::getDeltat);
 
 }