fixed linker errors. integration logic needs tweaked