almost Beta

Here it is cleaned up.