Some reworking of the build script. Gotta do some things in order first.