Working towards alpha 2