Finished (I think) adjusting old code, time to fix undefined references.