Beta

Putting all of the new changes onto the master branch