Basic generate/build working again