Revert "goin back to the basics"

This reverts commit bac6e1e3e6c39e75c61cc004636d311859c0385f.