Revert "Revert "Initial commit 1st stage""

This reverts commit a35ced5b0cd8f4cdbdc3e28b151a16f78403561f.