Merged in Eris and seems to compile, but running into linker issues.