Revamped build script!