Updated for Beta 1 release, really this time.