move for linker happiness and now debugging new linking scheme