Revert "NOT WORKING REVAMP"

This reverts commit 30d314ff0caa41e937ef1858caccf23e8b02ba91.

ok
Revert "Revert "NOT WORKING REVAMP""

This reverts commit e0b81aa27cd86926717d90b4fc8812dfd4ae64eb.
Revert "Revert "Revert "NOT WORKING REVAMP"""

This reverts commit eac45247cba22b4d710ba337faa37d013c2503a3.