Revert "Revert "stage 1""

This reverts commit 2c66affb0ea05f3412b2876d86cc759caf651325.