Got all previous build functionality running