Beta 1 Commit
Beta done, ready
More Changes
fix issue