My previous commit now with 100% less compiler errors :D