Revert "Revert "Stage 1""

This reverts commit 0b6e5a94758d5c78815dfce3dfc2947a77000698.