First push of the betamaker code