First functional beta
Final beta changes