Alex branch

I think we are pretty much ready for the alpha release.