Initial commit - beta2 changes