Work in progres, please take a look and give early feedback if this is the way we want to structure…

src/vm/program.cc

Index: src/vm/program.cc
diff --git a/src/vm/program.cc b/src/vm/program.cc
index 78f9ad445ba350007e15e98144a8f37c847a53a2..c5afa403a5415b123fa1fc654bf4cdb044e45a3f 100644
--- a/src/vm/program.cc
+++ b/src/vm/program.cc
@@ -1417,8 +1417,17 @@ void Program::Initialize() {
 
   {
     InstanceFormat format =
-        InstanceFormat::instance_format(2, InstanceFormat::FOREIGN_MARKER);
-    foreign_class_ = Class::cast(
+        InstanceFormat::instance_format(1,
+                                        InstanceFormat::FOREIGNFUNCTION_MARKER);
+    foreignfunction_class_ = Class::cast(
+        heap()->CreateClass(format, meta_class_, null_object_));
+  }
+
+  {
+    InstanceFormat format =
+        InstanceFormat::instance_format(2,
+                                        InstanceFormat::FOREIGNMEMORY_MARKER);
+    foreignmemory_class_ = Class::cast(
         heap()->CreateClass(format, meta_class_, null_object_));
   }