Fixed compiler errors; now compiles

Degubbing complete