Working on build system...