Working on the build system