Working branch for alpha3

alpha3 final.