Beta

Started work on updating for beta and new expansion