Beta2

almost ready