Revert "this should just WORK!!!!!"

This reverts commit 98d720830a84fe0ad642eb8c450a7ea729087c93.
Revert "new changes that are not yet commited"

This reverts commit df347b218b034e849751235fd04823aca4f7eca5.
Revert "new changes"

This reverts commit 16194689bc3548cc9f6308650cf0828903468ec3.