Should be done. About to compile and test.