Revert "Revert "major fucking surgery""

This reverts commit 70b138d02099769f7339657645510cd2ce434f83.