Beta

Beta version ready for testing