Changes per DFJustin, still won't compile