Fix another linker error (part 3)
Fix the last of the undefined reference errors. (Part 4)

For now...