Revert "Revert "Prototype Done""

This reverts commit 574365aaf386855531d07dd8fbee1d2ce54b844a.