Compiles again! Now just need to deal with the warnings