Add preliminary beta implementation