Fixed all compile errors, just need to test