Reworked to actually compile
Properly* reworked to compile
Tests successfully compiling!