Revert "Huge amount of stuff v1"

This reverts commit d6a6df8a6cff61031adbfb493212d0a3fd4f2365.
Revert "Revert "Huge amount of stuff v1""

This reverts commit 4e6634d09e36cdce2a6cc129d1647fbb93c93fdf.