More compile errors fixed. Getting down to the hard parts...