linking error mostly fixed - I think