Made a few changes to fix errors. Still not building.