Update the dirty build system (stage 1)
Clean build system stage #2