Found compilation errors that weren't showing up before, hm. wrapping up this weekend