Initial commit, updated for Beta 5.