1.0beta done 6th June