Initial Commit (code up to Beta 2)