Pushing to dev server for testing.
Fixed a bunch of build system crap.
Forgot to actually link these.