Starting to add new stuff for beta.