Improve build system to the point where it links