Finally almost completely compiling again with the corrections I've been making.