Revert "Revert "Basic Functionality V1""

This reverts commit 9121a911c485d761ada44227dcb80dfe135e0699.