Revert "Revert "Massive code incoming""

This reverts commit b1c640a49a0d4e86c5e92786d6a1a4b5058c2379.