finished most of integration, added new tests, dealing with linker errors