General improvments to the system, actually functioning build.