Fixed up linker errors + more code