diff --git a/lib/vagrant/environment/remote.rb b/lib/vagrant/environment/remote.rb
index b0f2a8542..feaf02520 100644
--- a/lib/vagrant/environment/remote.rb
+++ b/lib/vagrant/environment/remote.rb
@@ -69,6 +69,15 @@ module Vagrant
         hook(:environment_load, runner: Action::PrimaryRunner.new(env: self))
       end
 
+      def active_machines
+        targets = client.active_targets
+        names = []
+        targets.each do |t|
+          names << t.name
+        end
+        names
+      end
+
       # Returns the collection of boxes for the environment.
       #
       # @return [BoxCollection]
@@ -77,6 +86,27 @@ module Vagrant
         @_boxes ||= BoxCollection.new(nil, client: box_colletion_client)
       end
 
+      def config_loader
+        return @config_loader if @config_loader
+
+        root_vagrantfile = nil
+        if client.respond_to?(:vagrantfile_path) && client.respond_to?(:vagrantfile_name)
+          path = client.vagrantfile_path
+          name = client.vagrantfile_name
+          root_vagrantfile = path.join(name).to_s
+        end
+        @config_loader = Config::Loader.new(
+          Config::VERSIONS, Config::VERSIONS_ORDER)
+        @config_loader.set(:root, root_vagrantfile) if root_vagrantfile
+        @config_loader
+      end
+
+      # TODO: for now don't interfere with the default_provider method
+      #  once it is implemented on the Go side then this can be uncommented
+      # def default_provider(**opts)
+      #   client.default_provider
+      # end
+
       # Returns the host object associated with this environment.
       #
       # @return [Class]
@@ -96,14 +126,14 @@ module Vagrant
         client.target(name)
       end
 
-      def setup_home_path
-        # no-op
-        # Don't setup a home path in ruby
+      # @param [String] machine name
+      # return [Vagrant::Machine]
+      def machine(name, *_, **_)
+        client.machine(name)
       end
 
-      def setup_local_data_path(force=false)
-        # no-op
-        # Don't setup a home path in ruby
+      def machine_names
+        client.target_names
       end
 
       # The {MachineIndex} to store information about the machines.
@@ -113,19 +143,23 @@ module Vagrant
         @machine_index ||= Vagrant::MachineIndex.new(client: client.target_index)
       end
 
-      def config_loader
-        return @config_loader if @config_loader
+      def primary_machine_name
+        client.primary_target_name
+      end
 
-        root_vagrantfile = nil
-        if client.respond_to?(:vagrantfile_path) && client.respond_to?(:vagrantfile_name)
-          path = client.vagrantfile_path
-          name = client.vagrantfile_name
-          root_vagrantfile = path.join(name).to_s
-        end
-        @config_loader = Config::Loader.new(
-          Config::VERSIONS, Config::VERSIONS_ORDER)
-        @config_loader.set(:root, root_vagrantfile) if root_vagrantfile
-        @config_loader
+      # def root_path
+      # TODO: need the vagrantfile service to be in place in order to be 
+      # implemented on the Go side
+      # end
+
+      def setup_home_path
+        # no-op
+        # Don't setup a home path in ruby
+      end
+
+      def setup_local_data_path(force=false)
+        # no-op
+        # Don't setup a home path in ruby
       end
 
       def vagrantfile
diff --git a/plugins/commands/serve/client/project.rb b/plugins/commands/serve/client/project.rb
index 56cfcc9cc..8b4bd227e 100644
--- a/plugins/commands/serve/client/project.rb
+++ b/plugins/commands/serve/client/project.rb
@@ -7,8 +7,8 @@ module VagrantPlugins
         def active_targets
           t = client.active_targets(Empty.new)
           targets = []
-          t.each do |target|
-            targets << Target.load(target)
+          t.targets.each do |target|
+            targets << Target.load(target, broker: broker)
           end
           targets
         end
@@ -78,6 +78,13 @@ module VagrantPlugins
           resp.path
         end
 
+        # return [Vagrant::Machine]
+        def machine(name)
+          t = client.target(SDK::Project::TargetRequest.new(name: name))
+          machine = mapper.map(t, to: Vagrant::Machine)
+          return machine
+        end
+
         # return [String]
         def primary_target_name
           resp = client.primary_target_name(Empty.new)
@@ -118,7 +125,6 @@ module VagrantPlugins
         # Returns a machine client for the given name
         # return [VagrantPlugins::CommandServe::Client::Target::Machine]
         def target(name)
-          logger.debug("searching for target #{name}")
           target = Target.load(
             client.target(SDK::Project::TargetRequest.new(name: name)),
             broker: broker