Revert "Good Working V1"

This reverts commit 73449b73082736ed8957ea83457eee03f36c6e48.
Revert 73449b7..f5f1cd9

This rolls back to commit 73449b73082736ed8957ea83457eee03f36c6e48.
V2
V2.1