FIXED SOME COMPILE ERRORS, STILL SOME LEFT