Revert "Revert "Second Machine""

This reverts commit d2d53e7ce28b72e657df6aa3200292d69e5837ac.