Revert "Revert 3cb3e2a..94343e6"

This reverts commit 5095513d7a0bbd88645ffd5228963f4f48e9b717.
Revert "Alpha 2"

This reverts commit 94343e681476c6faf6213b3431ee76a975e473f6.