More Updates ( Still with Compile Errors )