Revert "Revert "Bascic Construction""

This reverts commit 10c86bf25706dc088ae067bbfd165281c6473ae1.