Still some linkage errors, looking for a fix