Reworking build system...