Revert "Last refactor before adding Gliimpse mode"

This reverts commit def121f82f95e4185c27d8a3e400f20524aad351.
We can switch between modes